From f16c43ddb5c7dd3f579d399f800db0c37aeaf66d Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Thu, 12 Jul 2018 18:18:08 -0600 Subject: [PATCH] clean up some Variable * is reassigned a value before the old one has been used. (#232) one of these was actually a very old bug. --- cst.cc | 2 -- dmtlog.cc | 7 +++---- garmin.cc | 1 - gdb.cc | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cst.cc b/cst.cc index f85dc3cc8..5dd4ba52c 100644 --- a/cst.cc +++ b/cst.cc @@ -254,8 +254,6 @@ cst_data_read() } cst_add_wpt(track, wpt); - wpt = nullptr; - wpt = new Waypoint; diff --git a/dmtlog.cc b/dmtlog.cc index 8428de4b2..cec7a5d61 100644 --- a/dmtlog.cc +++ b/dmtlog.cc @@ -419,10 +419,9 @@ read_CTrackFile(const int version) fatal(MYNAME ": Unknown or invalid track file (%d).\n", ver); } - int32_t ux = gbfgetint32(fin); // Unknown 2 - ux = gbfgetint32(fin); // Unknown 3 - ux = gbfgetint32(fin); // Unknown 4 - (void) ux; // Silence warning. + (void) gbfgetint32(fin); // Unknown 2 + (void) gbfgetint32(fin); // Unknown 3 + (void) gbfgetint32(fin); // Unknown 4 route_head* track = route_head_alloc(); track_add_head(track); diff --git a/garmin.cc b/garmin.cc index 9b08c7e05..16060d47c 100644 --- a/garmin.cc +++ b/garmin.cc @@ -853,7 +853,6 @@ sane_GPS_Way_New() way->facility[0] = 0; way->addr[0] = 0; way->cross_road[0] = 0; - way->cross_road[0] = 0; way->dpth = 1.0e25f; way->wpt_class = 0; // user waypoint by default. diff --git a/gdb.cc b/gdb.cc index a814c7e24..bd54c2c53 100644 --- a/gdb.cc +++ b/gdb.cc @@ -844,7 +844,7 @@ read_route() bounds.max_alt = FREAD_DBL; } bounds.min_lat = FREAD_LATLON; - bounds.min_lat = FREAD_LATLON; + bounds.min_lon = FREAD_LATLON; if (FREAD_C == 1) { bounds.min_alt = FREAD_DBL; } -- 2.30.2